Move to an app infrastructure

Moving to an app infrastructure