move files into src directory and change the Makefile rule