Re-arrange classes