Reorganize internal directory structure