diff --git a/patches/erpnext_structure_cleanup.py b/patches/erpnext_structure_cleanup.py
index a61c523cfd..ec651d30ba 100644
--- a/patches/erpnext_structure_cleanup.py
+++ b/patches/erpnext_structure_cleanup.py
@@ -68,7 +68,7 @@ def rename_merge_modules():
 	rename_lst = [['CRM', 'Selling'], ['SRM','Buying'], ['Material Management', 'Stock'], ['Payroll','HR'], ['Maintenance', 'Support']]
 	for d in rename_lst:
 		# create new module manually and export to file???????
-		reload_doc(d[1], 'module_def', d[1])
+		reload_doc(d[1].lower(), 'Module Def', d[1])
 
 	merge_lst = [['Tools', 'Utilities'], ['Application Internal', 'Utilities'], ['Settings', 'Setup']]
 	# settings hardcoded in my_company
@@ -80,7 +80,7 @@ def rename_merge_modules():
 	for d in lst:
 		update_module(d[0], d[1])
 		delete_doc('Module Def', d[0])
-		
+	reload_doc('Utilities', 'Module Def', 'Utilities')
 	
 def update_module(from_mod, to_mod):
 	for t in ['DocType', 'Page', 'Search Criteria', 'DocType Mapper', 'Print Format', 'Role']:
diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt
index cee9770a58..15ba781a67 100644
--- a/setup/doctype/company/company.txt
+++ b/setup/doctype/company/company.txt
@@ -1,919 +1,377 @@
+# DocType, Company
 [
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2010-08-08 17:08:55',
+		'docstatus': 0,
+		'modified': '2011-07-01 17:43:29',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all DocType
 	{
 		'_last_update': '1309506817',
-		'allow_attach': None,
-		'allow_copy': None,
-		'allow_email': None,
-		'allow_print': None,
-		'allow_rename': None,
 		'allow_trash': 1,
 		'autoname': 'field:company_name',
-		'change_log': None,
-		'client_script': None,
-		'client_script_core': None,
-		'client_string': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:55',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocType',
 		'document_type': 'Master',
-		'dt_template': None,
-		'hide_heading': None,
-		'hide_toolbar': None,
-		'idx': None,
-		'in_create': None,
-		'in_dialog': None,
-		'is_transaction_doc': None,
-		'issingle': None,
-		'istable': None,
-		'max_attachments': None,
-		'menu_index': None,
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
 		'module': 'Setup',
-		'name': 'Company',
-		'name_case': None,
-		'owner': 'Administrator',
-		'parent': None,
-		'parent_node': None,
-		'parentfield': None,
-		'parenttype': None,
-		'print_outline': None,
-		'read_only': None,
-		'read_only_onload': None,
-		'search_fields': None,
+		'name': '__common__',
 		'section_style': 'Tabbed',
-		'server_code': None,
-		'server_code_compiled': None,
-		'server_code_core': None,
 		'server_code_error': ' ',
 		'show_in_menu': 0,
-		'smallicon': None,
-		'subject': None,
-		'tag_fields': None,
-		'use_template': None,
-		'version': 92
+		'version': 93
 	},
+
+	# These values are common for all DocField
 	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-08-08 17:08:55',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 1,
-		'match': None,
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'PERM00119',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': 0,
-		'cancel': 0,
-		'create': 1,
-		'creation': '2010-08-08 17:08:55',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 2,
-		'match': None,
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'PERM00120',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'read': 1,
-		'role': 'System Manager',
-		'submit': 0,
-		'write': 1
-	},
-	{
-		'amend': None,
-		'cancel': 0,
-		'create': None,
-		'creation': '2010-08-08 17:08:55',
-		'docstatus': 0,
-		'doctype': 'DocPerm',
-		'execute': None,
-		'idx': 3,
-		'match': None,
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'PERM00121',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'permissions',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'read': 1,
-		'role': 'All',
-		'submit': None,
-		'write': None
-	},
-	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-07-01 13:23:37',
-		'default': None,
-		'depends_on': None,
-		'description': 'Please Enter Company Name and Abbr and save the document. Once saved Accounting Settings will be populated automatically',
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
-		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
-		'idx': 1,
-		'in_filter': None,
-		'label': 'Details',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL05650',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
+		'name': '__common__',
 		'parent': 'Company',
 		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'parenttype': 'DocType'
 	},
+
+	# These values are common for all DocPerm
+	{
+		'cancel': 0,
+		'doctype': 'DocPerm',
+		'name': '__common__',
+		'parent': 'Company',
+		'parentfield': 'permissions',
+		'parenttype': 'DocType',
+		'read': 1
+	},
+
+	# DocType, Company
+	{
+		'doctype': 'DocType',
+		'name': 'Company'
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 1,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'amend': 0,
+		'create': 1,
+		'doctype': 'DocPerm',
+		'idx': 2,
+		'permlevel': 0,
+		'role': 'System Manager',
+		'submit': 0,
+		'write': 1
+	},
+
+	# DocPerm
+	{
+		'doctype': 'DocPerm',
+		'idx': 3,
+		'permlevel': 1,
+		'role': 'All'
+	},
+
+	# DocField
+	{
+		'description': 'Please Enter Company Name and Abbr and save the document. Once saved Accounting Settings will be populated automatically',
+		'doctype': 'DocField',
+		'fieldtype': 'Section Break',
+		'idx': 1,
+		'label': 'Details',
+		'oldfieldtype': 'Section Break',
+		'permlevel': 0
+	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'company_name',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 2,
-		'in_filter': None,
 		'label': 'Company',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00695',
-		'no_column': None,
 		'no_copy': 0,
 		'oldfieldname': 'company_name',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
 		'description': 'Please Enter Abbreviation or Short Name properly as it will be added as Suffix to all Account Heads.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'abbr',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 3,
-		'in_filter': None,
 		'label': 'Abbr',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00696',
-		'no_column': None,
 		'no_copy': 0,
 		'oldfieldname': 'abbr',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'address',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 4,
-		'in_filter': None,
 		'label': 'Address',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00697',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'address',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-04-19 18:48:56',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_currency',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 5,
-		'in_filter': None,
 		'label': 'Default Currency',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': '000031318',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
-		'oldfieldtype': None,
 		'options': 'link:Currency',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': 1,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'reqd': 1
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-07-01 13:23:37',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 6,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL05651',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'phone_no',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 7,
-		'in_filter': None,
 		'label': 'Phone No',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00699',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'phone_no',
 		'oldfieldtype': 'Data',
 		'options': 'Phone',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'email',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 8,
-		'in_filter': None,
 		'label': 'Email',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00700',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'email',
 		'oldfieldtype': 'Data',
 		'options': 'Email',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'fax',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 9,
-		'in_filter': None,
 		'label': 'Fax',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00701',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'fax',
 		'oldfieldtype': 'Data',
 		'options': 'Phone',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'website',
 		'fieldtype': 'Data',
-		'hidden': None,
-		'icon': None,
 		'idx': 10,
-		'in_filter': None,
 		'label': 'Website',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00702',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'website',
 		'oldfieldtype': 'Data',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2011-07-01 13:23:37',
-		'default': None,
-		'depends_on': None,
 		'description': 'Company registration numbers for your reference. Example: VAT Registration Numbers etc.',
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 11,
-		'in_filter': None,
 		'label': 'Registration Info',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL05652',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
 		'description': 'Company registration numbers for your reference. Tax numbers etc.',
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'registration_details',
 		'fieldtype': 'Code',
-		'hidden': None,
-		'icon': None,
 		'idx': 12,
-		'in_filter': None,
 		'label': 'Registration Details',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00704',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'registration_details',
 		'oldfieldtype': 'Code',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-07-01 13:23:37',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Section Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 13,
-		'in_filter': None,
 		'label': 'Accounting Settings',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL05653',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Section Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'default_bank_account',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 14,
-		'in_filter': None,
 		'label': 'Default Bank Account',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00706',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'default_bank_account',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'receivables_group',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 15,
-		'in_filter': None,
 		'label': 'Receivables Group',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00707',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'receivables_group',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'payables_group',
 		'fieldtype': 'Link',
-		'hidden': None,
-		'icon': None,
 		'idx': 16,
-		'in_filter': None,
 		'label': 'Payables Group',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00708',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'payables_group',
 		'oldfieldtype': 'Link',
 		'options': 'Account',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': 'Client',
-		'width': None
+		'trigger': 'Client'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2011-07-01 13:23:37',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
-		'fieldname': None,
 		'fieldtype': 'Column Break',
-		'hidden': None,
-		'icon': None,
 		'idx': 17,
-		'in_filter': None,
-		'label': None,
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL05654',
-		'no_column': None,
-		'no_copy': None,
-		'oldfieldname': None,
 		'oldfieldtype': 'Column Break',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
 		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
 		'width': '50%'
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
 		'colour': 'White:FFF',
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'yearly_bgt_flag',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 18,
-		'in_filter': None,
 		'label': 'If Yearly Budget Exceeded',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00710',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'yearly_bgt_flag',
 		'oldfieldtype': 'Select',
 		'options': '\nWarn\nIgnore\nStop',
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'monthly_bgt_flag',
 		'fieldtype': 'Select',
-		'hidden': None,
-		'icon': None,
 		'idx': 19,
-		'in_filter': None,
 		'label': 'If Monthly Budget Exceeded',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00711',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'monthly_bgt_flag',
 		'oldfieldtype': 'Select',
 		'options': '\nWarn\nIgnore\nStop',
-		'owner': 'jai@webnotestech.com',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'credit_days',
 		'fieldtype': 'Int',
-		'hidden': None,
-		'icon': None,
 		'idx': 20,
-		'in_filter': None,
 		'label': 'Credit Days',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00712',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'credit_days',
 		'oldfieldtype': 'Int',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
 		'depends_on': 'eval:!doc.__islocal',
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'credit_limit',
 		'fieldtype': 'Currency',
-		'hidden': None,
-		'icon': None,
 		'idx': 21,
-		'in_filter': None,
 		'label': 'Credit Limit',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00713',
-		'no_column': None,
-		'no_copy': None,
 		'oldfieldname': 'credit_limit',
 		'oldfieldtype': 'Currency',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 0,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 0
 	},
+
+	# DocField
 	{
-		'allow_on_submit': None,
-		'colour': None,
-		'creation': '2010-08-08 17:08:55',
-		'default': None,
-		'depends_on': None,
-		'description': None,
-		'docstatus': 0,
 		'doctype': 'DocField',
 		'fieldname': 'trash_reason',
 		'fieldtype': 'Small Text',
-		'hidden': None,
-		'icon': None,
 		'idx': 22,
-		'in_filter': None,
 		'label': 'Trash Reason',
-		'modified': '2011-07-01 13:46:45',
-		'modified_by': 'Administrator',
-		'name': 'FL00716',
-		'no_column': None,
 		'no_copy': 1,
 		'oldfieldname': 'trash_reason',
 		'oldfieldtype': 'Small Text',
-		'options': None,
-		'owner': 'Administrator',
-		'parent': 'Company',
-		'parentfield': 'fields',
-		'parenttype': 'DocType',
-		'permlevel': 1,
-		'print_hide': None,
-		'report_hide': None,
-		'reqd': None,
-		'search_index': None,
-		'trigger': None,
-		'width': None
+		'permlevel': 1
 	}
-]
+]
\ No newline at end of file
diff --git a/utilities/Module Def/Utilities/Utilities.txt b/utilities/Module Def/Utilities/Utilities.txt
new file mode 100644
index 0000000000..98b4d0f526
--- /dev/null
+++ b/utilities/Module Def/Utilities/Utilities.txt	
@@ -0,0 +1,28 @@
+# Module Def, Utilities
+[
+
+	# These values are common in all dictionaries
+	{
+		'creation': '2011-07-01 17:46:25',
+		'docstatus': 0,
+		'modified': '2011-07-01 17:47:34',
+		'modified_by': 'Administrator',
+		'owner': 'Administrator'
+	},
+
+	# These values are common for all Module Def
+	{
+		'disabled': 'No',
+		'doctype': 'Module Def',
+		'is_hidden': 'No',
+		'module_label': 'Utilities',
+		'module_name': 'Utilities',
+		'name': '__common__'
+	},
+
+	# Module Def, Utilities
+	{
+		'doctype': 'Module Def',
+		'name': 'Utilities'
+	}
+]
\ No newline at end of file
diff --git a/utilities/doctype/rename_tool/rename_tool.txt b/utilities/doctype/rename_tool/rename_tool.txt
index 3a7a27cf0e..9269185da5 100755
--- a/utilities/doctype/rename_tool/rename_tool.txt
+++ b/utilities/doctype/rename_tool/rename_tool.txt
@@ -5,7 +5,7 @@
 	{
 		'creation': '2011-06-23 11:03:25',
 		'docstatus': 0,
-		'modified': '2011-06-23 11:03:25',
+		'modified': '2011-07-01 17:46:42',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},
@@ -24,7 +24,7 @@
 		'name': '__common__',
 		'section_style': 'Simple',
 		'show_in_menu': 0,
-		'version': 6
+		'version': 7
 	},
 
 	# These values are common for all DocField