Gemfile added, require/todos reorganized