renaming files and breakout into class files.