Organized the core files to reflect out new project structure.