Change module structure, classes structure and other #2.