added binary/bitwise modules, removed old