All our new changes
-many duplicate files
-master files are in /app folder!