Renamed base classes and fixed .gitignore.