In no particular order: Move Chameleon code out to seperate module Move remote base code out to seperate module Remove dependance on OSS