classes moved to namespace