Made classes function in their new structure