issue#63 - changed directory structure