Revert "Moved local files around"

This reverts commit a5f55e96978ce510eb030b2c3e2c2cbf11d09d03.