Moved files to src directory. Make file changed to reflect this
Minor changes to makefile