Fix import statements
Add Path abstraction