Minor fixes

 * Moved test files into tests/
 * Created Makefile
 * pep8 cleanup