Code namespace fix, added base files