changed directory structure
merge