remove old files; change directory structure