Update app locations
Clean up unused code, slim down app template