Bit refactored helpers folder