commented out bug testing feature for demo tomorrow.
Updated folder structure and some minor debugging feature commented out for tomorrows demo. Please update.