New directory structure to conform to conventions