Moved Collection and Menu support to project