Removed old directory structure

Old tests preserved.