Cleaned up the optsfiles director and made some changes to phase1 and phase2