Made the naming convention a lot more consistent.
Added the some files that I forgot in the last commit.