reorganise into multiple app sub-folders