Refactored the model package to allow easier separation of security objects