Change generated file names to something more pythonic
Begin implementing the focus template