Rearranging the project directory structure...