Also do some small refactoring and rename the PS classes to BIT to avoid any possible namespacing problems