restructure/optimize for release/wiki