Revert "Derp!"

This reverts commit 47c9463f6153114159470a1a7db819ef1735f8e4.
Revert "Re-organize Build..."

This reverts commit 4d02adf701da7d40110b068a684d8bda68c8a745.