Magic numbers killed completely, and module info moved to .h file