More template app re-organization

Signed-off-by: David Celis <me@davidcel.is>