Add shim for Ti Menu
Queue shim implementation and some restructuring of the includes