Refactor of Isotypes to remove Spring from core