- Removed hard-coded dir refs