master: changed directory structure