clean up - converting all files to IB namespace