some small changes, only details in pathes and packages