Updated app structure

Signed-off-by: Jon Yardley <jonyardley@me.com>