Moved web service base url to inline WebserviceManager
Project cleanup and code organization