Restructuring organization.
Updating Hydra files for fixes and changes to the cntl file.