Tech: Fix index.html issue
Tech: Modify folder structure.
Tech: resolve conflicts for index.html
Fix: Re-structure folders for UI