rename/reorganize, example in readme, bugfixes