Updated Makefile. Reorganized files