Organize class files