Removed unnecessary AutoMapper library for the time being (May add it back later if it's needed). Some reorganization of GUI entities