Revert "Path changes."

This reverts commit 29a830dfbb5c216c2c9582181a72833fbc7edaae.