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