Fixed new Species removal and refactored classes