Revert "updating file paths"

This reverts commit 4dc74bb4102b87b200f2f74e9444e37812290ea4.
Revert "Use more clean/clear method for building paths"

This reverts commit bf3e6136fb17af57e8fabf93f07f86fd8f26bc69.
Revert "newest"

This reverts commit a4bdaefc7450c316d2c9346a989799bae177ebf1.