Massive refactoring in hopes of making build cleaner