Updated README, moved files around