moved some directories around, updated README