Added router & some controllers