corrected demo, tidied up folders