Complete overhaul of directory structure