Revert "changed file locations"

This reverts commit c46a4e2b1e661d9dc5c47b747400110dadd02cca.