big update to clean up directory structure