Revert "Merge pull request #3 from stevector/file-re-org"

This reverts commit 80d7c09b62fdfbe8f82172f7c83d305409d26198, reversing
changes made to 4643e629ad3017d5f88af9d1ceffac1111578333.