Remove logic from contract classes and replace some User methods

Move logic from contract classes to static classes Make...Contract