dir cleanup and restructure