Updated code organisation