Reorganize to a sane gem structure