Change submodule layout
Adapt Makefile
Bump
Adapt Makefile
Bump
Bump widgets
Bump melange
Fix Makefile