moving some files around, trying to learn how to use classes a little more