Promotion integration

Lots of cleanup, integrate Promotion, changed some class names. Check out how I optimized the menu view controller :)