Updates readme, reorganizes files