Restructured includes. Added package.load / package.hotswap

Also some premature optimization
More Color class functions