Feature/505 webclient bundle structure