Changed file structure and fixed to compile correctly alongside Core project.