Cleaned up directories. Fixed demo html pages.