Re-organise files into folders
Cleanup demo project