[Restructure] DEFINES changes for debug/release