Move program files to src
Improve Makefile