reorganised folders and implemented shrink navbar