Moved all menu classes into folder Menu, removed unused methods