Moving all core related files to a seperate package