Moved files to src, updated readme and makefile