Moved screen definitions/implementations to avoid micro files