GPII-271: Folders organized a bit more clearly