Fixed menu class, removed files