Added Accessors - removed extra  files