Moved generic base classes from 'hub' project to core