[windup-dev] New branch - Modularize-03

Hi, 1) merging didn't work for me (too many conflicts at once), so I rebased, but instead of force push, I created a new branch, which is current master + Modularize_new. Is that git process ok for all? 2) Can we merge this into master now? Regards, Ondra