Restructure generated controller, form and template files
Rename CommonAdmin to Admin template folder
Updated inheritance from CommonAdmin to Admin template folder