Satisfy Apache licensing requirements by moving stuff to separate class