Reorganize directories for new version