[Core] Split classes