Rearranged the project according to the new spec