Re-organize class folders and cleanup