Rearranged the projects structure.