cleaned up; added tests;
clean up file structure