Changed the module hierarchy to match uint values when in uint_macros.rs