move files to src and fixed makefile