tidied up directories a bit