Rearranged folders

for clarity