The two classes I moved into their own package...