Moved basic form fields to core module
Moved basic form fields to core module
Fixed naming scheme