Integration of FSD into CORE

This is the first part of FSD integration into the official repository.

After discussion with Florian, it was decided to split the huge MR !1174 (closed) into several smaller parts easier to review. This is the first of the smaller MR regarding the data structures in the CORE directory.