Flattened out directory structure again, eliminating . import.