Feature/folder structure