Moved class, added namespace