Fixed packaging for AppMain