More classpath organization, fix ConcurrentModificationException