Added general folder structure