Reorganise and add initial Gemfile