reordered some classes (removed elements package)