consolidated files, updated readme