Refactores modules structure
Fixes imports
Adds queryset monkeypatch
Modifies model