Split PageStep static inner classes into proper classes