Refactor client architecture/loading