Fixed location errors (or at least I should.)
Moved classes into rightful packages.