add more helper files and fix paths