Moved basic system setup into it's own role