changed more directory structure