Reorganized some of the functions I have to consolidate them into more appropriate files.