changed directory structure according to conventions