Reorg files, started main init.pp file