refactored stuff
cleaned up dependencies, renamed project