Slight reorganisation in line with Ember