consolidated source files, updated readme