Revert "Attempting to rearrange file structure to make merging easier."

This reverts commit 2e4dbff2209661b6c36d69632a1447e73ba45739.