GR: updated gem to tidier folder structure