Feat/core structure