Gemfiles reorganized