Overhauled database scheme.
Deleted obsolete test directory and all it's contents.