Demo App added and restructured folders