More structure, basic core class and Menu class