added in a makefile, cleaned up testing folder