re-arrange directories a bit