Refactoring done, loaders are working.