Feature/organised configuration