Redone the file structure and added Namespaces.