3.6/dev intrepid lwright libraries

Move to webservices/model layer