moved some directories around