Rearrange and clean up the project