Move manager and queryset out of models
Clean up model imports and block library