Switched back to master branches of lens submodules.
Updates to reflect changes of Lens refactor.