Initial documenation skeleton
Minor restructuring of classes
Initial test skeleton