add rebuild after calling setup, better format for setup files