H1: Moved some classes back. Excluded a lot of webarchive-commons dependencies.