Formatting and removal of unused imports. Spike. henrik
Major package restructuring. Spike. Henrik.