Move marto package to sub-directory
Add BasicAuth + Headers on RequestTemplate
Fix test