Moved class into file