refactored, seperated classes into diff files, cleaned up display and import process