moves around some files and fixed some of program

worked on the program a bit and moved around some files