Update and well organized all stuff