change filepath to path and fix path namespace collision