Moved class into directory