Some cleanup, added new Readme.md, moved test inputs