Reorganize top-level folders