Moved classes in appropriate package