cleanup structure
update README