Modularisation

Don't Make It Public. Give It a Boundary