Move source files and modify Makefile. Fixes #87