Use namespace, remove unwanted write functionality, rename classes
Rename files to match classes