Moved unitary operations and data into a conglomerate.
Modified main program to accomae new architecture