big update to directory structure