Reorganise in to working gem structure