Fixed conflicts Added "code" directory for include to make it easier to include core headers Stopped warnings (probably cl specific)