Moved class to its own file