major overhaul of directory structure