Moved files to src and updated readme and makefile