Reorganize gem folder structure