Reorganise Projects directory structure and Makefile