Add rocket

Also some project refactoring