move nested classes to top level
update installation instruction