Major restructure

New directories, examples from Paul Chisholm, cleaned up code, another test.