First task braindump
Switch to roles file structure though we don't need its power quite yet