v2.1 upgrade and major restructure

fixes #11