Add additional folders
Fix folder structure