re-arranged dirs