Re-organizing folders, and adding data