changed pathnames to comply with standart layout