simplified components, moved gllogic into loaders