Relocated Scripts/app up to app. Many other cleanups in prep for Ng alternative