Add folders, update Gemfile