Use filepath rather than generic path package