Clean up tasks, add zeus/guard and rename files