Started updating modules to use lens package