Updated build grouping
Async modules loading based on the user click