Project code organisation and improving logging