Made ImportApp public
Removed some duplicate classes
Separated out the csv from he rest of the app hierarchy and modified tests appropriately
Clean up PMD violations
Clean up PMD violations