removing APP suffix from app in modules
removing extra App refrence