Add some sort of mvc structure