Moved files to subnamespace and added AccessorFactory