fix pathes, add other modules