Moved classes to the packages they actually declare