Added support for broken Aiken format and re-structured code  - refs BT#7074