Breaking change: transforming this into modularizable git repo - or trying to