Remove Loader class, add namespace variable in factories