removed unnecessary files.  Reorder of form fields is handled by propertiestool.xml
updated version