Switch to more conventional namespace/directory setup
Updated gemfile.lock