Reworked module system and a bit code cleaning