Moved class to Maven src