Did a refacturing for the namespaces and file structures in the core project.