Reorganize for rtm package