Continued work on Structure/Lens module