Moved class to better location