fixed baseUrl
cleanup
external deps
fixed markup
new structure