Slight refactoring: renamed module to ASTEROID plus small other things