major directory structure changes for the better