Reorganizing gem file (no real changes)