Restructure, cleaning, update