rebuilt with new structure. SimplePerspective passes tests.