restructured and fixed annoying ansible stuff