Cleaned out blocks of unnecessary code, and re organized the files.