Directory structure is now considerably saner.