Separated unit model object from its display object and moved all events to methods in events.js