First batch of organizational changes to kalabox framework.