Reorganize every class