Restructuring client-side code
Restructuring
Refactoring complete