refactored and got rid of Admin namespace all GREEN