Simplyfied the project structure.