Feature/add directory structure