Clean up some missing dirs and add them into the skeleton