master: update folder structure