Moved around the files so they reside in the same src directory as the other classes/packages.