Reorganization of loader directories.
Minor code cleanup, syntax fix.
Fixed syntax errors caused by botched regex replace.