fix(*) various fixes & layout for inclusion in other projects
Merge pull request #1 from sym3tri/updates-for-integration

fix(*) various fixes & layout for inclusion in other projects