More descriptive file names, separated code out some more