merged stuff into one application
moved all to one app