Package refactor. Added LoaderGroup