Menu funcionality moved to its own package