Moved to engine package to get better API
Changed Color and Type into enums