introduced new hierachy core/src and core/include