clean up
added lost files from refactoring back to the repository
ok, this time they're added