Strip and update app structure
Fix json comma
Fix gulp errors
Fix gulpfile for watching