Renamed packages.
Formatted code and organized imports.
Closed some readers.