Remove redundant directories, fix Gemfile