Menu was remade using pattern builder. Classes were sorted by packages. Logging system was made using logback and slf4j.