Added new demo, updated file locations. Optimized.