make portable file paths
code clean up; make portable paths
make portable paths in builder
clean up file paths
remove comments/code for testing
add import of required lib
update changes