Modularise init file