Update Setup

re-arrange some stuff