Final cleanup & moves some stuff to manifest