Moved files around, updated README