separate modules and change to init.pp