Move executables into bin
Refactor into lib/
More cleanup/refactoring