Re-organize class folders