Directory structure reorganized.