Major update and clean project