Modulerisation PoC

Feel free to cut/change/reject whatever :)