Updated flow of program and remove problem files