restructure setup files