Revert "Attempting to make automatic merge possible"

This reverts commit e12d6b60a2a68083b25b4d939a05e7f7d7560779.
Revert "Massive directory restructuring as per MatthewSorensen"

This reverts commit 20d66fe9bc134249d2080f18926916dde6a14bcc.