Re-worked the directory structure.