Moved class to src/