Restructure directories for more idomatic dir layout.