Removed broken demos, fixed other demos (they should all work now), consolidated files