Re-organized code.
Simplified loaders.