Reorganizing setup files