Refactored project into a Demo app and Menu folder