Refactor

# Refactored loader
# Moved logic from codebricks to definitionTypes
Refactor