Restructor and use Router
updated assets files for deployment