Reorganized the project for a clear tree