Bug 961194 Modularize toolkit/loader