Huge cleanup commit in preparation for premake building