New directory structure, test-system added.