A bit name refactoring. Added a brand new unit module.