[MERGE] Refactor assets bundle for future features