Re-Add VivaApp.java