Split loaders into separate modules
Clean up loaders a bit