cleaning up directory locations

- removed hardcoded paths
- some small clean up of 80 char line lengths