Revert "Fixed files pointing to old path."

This reverts commit a2fad7710ddb82b0789de6354cf59d45c469307a.
Revert "Changed paths"

This reverts commit bf7054ee091eb5c5b7d34556c3814235e5f2001b.