reorganise class structure folder