Rearranged the project directory structure