Add/Fixed

* remove struts
* remove 'baseURL' strings.