change directory structure as discussed