refactored data_uploader
removed testing class which adds more tests
refactored models