Refactor folder structure and update root webkit instance