Fixed includes for new structure

I propose we use this structure for the core too.