Modularise setup