WebBundle cleanup, set basic structure