fix paths and packages