Rename features and reorganise files