Moved HFE related classes into .form package