Updated and reorganized gem file