Folder structure improvements (hopefully)