Changed class names, main class location, menu almost working