Merge minimal admin classes into normal admin

Related to #46