Tidy up the top level, Legacy code to dirs