moving stuff into src, updated Makefile