Renamed files; modified README
Working out bugs