Organized classes and removed unnecessary imports.