remove hardcoded paths

Continued removing hard coded paths from code