Restructuring app for module compliance