Reorganized the project to get a clear tree