First draw at restructuring of the project. Still neither compiling nor doing the right stuff.