Moving files around, updated README