Move main app into its own folder
Add data collector app