Refactoring Extract Class

We completed Extract class refactroing and moved class to Model layer
and made changes to Admin.cs class