Refactoring

Refactoring the admin classes of a couple of modules.