Re-organized the Classes directory