Moving files to respective directory + Update Makefile