Refactoring the handlebar-rhino into its own lib