From laptop 15-11-13

Removed various obsolete tests and restructured folders. Added comments
to tests in use